Revision: tla--giles--1.1--patch-11
Archive: giles@nemeton.com.au--2003-GPL
Creator: Giles Lean <giles@nemeton.com.au>
Date: Sat Jul  5 12:09:10 EST 2003
Standard-date: 2003-07-05 02:09:10 GMT
Summary: merge with lord@emf.net--2003b/tla--devo--1.1--patch-71
Keywords: 
New-files: 
New-directories: 
Removed-files: 
Removed-directories: 
Renamed-files: 
Renamed-directories: 
Modified-files: ./ChangeLog ./libarch/arbdelta.c
    ./libarch/cmd-changeset.c ./libarch/cmd-revdelta.c
    ./libarch/cmd-star-merge.c ./libarch/cmd-what-changed.c
    ./libarch/commit.c ./libarch/local-cache.c
    ./libarch/make-changeset.c ./libarch/make-changeset.h
    ./libarch/star-merge.c ./libarch/star-merge.h
    ./libarch/tag.c ./libarch/undo.c
    ./tutorial/elementary-branches.doc
    ./tutorial/exploring-changesets.doc
Modified-directories: 
New-patches: giles@nemeton.com.au--2003-GPL/tla--giles--1.1--patch-11
    jblack@merconline.com--2003/tla--devo--1.1--base-0
    jblack@merconline.com--2003/tla--devo--1.1--patch-1
    jblack@merconline.com--2003/tla--devo--1.1--patch-2
    jblack@merconline.com--2003/tla--devo--1.1--patch-3
    lord@emf.net--2003b/tla--devo--1.1--patch-63
    lord@emf.net--2003b/tla--devo--1.1--patch-64
    lord@emf.net--2003b/tla--devo--1.1--patch-65
    lord@emf.net--2003b/tla--devo--1.1--patch-66
    lord@emf.net--2003b/tla--devo--1.1--patch-67
    lord@emf.net--2003b/tla--devo--1.1--patch-68
    lord@emf.net--2003b/tla--devo--1.1--patch-69
    lord@emf.net--2003b/tla--devo--1.1--patch-70
    lord@emf.net--2003b/tla--devo--1.1--patch-71
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-3
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-4
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-5
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-6
    mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-7
Removed-patches: 

Patches applied:

 * jblack@merconline.com--2003/tla--devo--1.1--base-0
   tag of lord@emf.net--2003b/tla--devo--1.1--patch-62

 * jblack@merconline.com--2003/tla--devo--1.1--patch-1
   Changed the names of the innocent

 * jblack@merconline.com--2003/tla--devo--1.1--patch-2
   Updated documents to explain how to show a changeset in --diffs format

 * jblack@merconline.com--2003/tla--devo--1.1--patch-3
   Fixed the cached revision documents

 * lord@emf.net--2003b/tla--devo--1.1--patch-63
   added missing include of hackerlab/os/time.h

 * lord@emf.net--2003b/tla--devo--1.1--patch-64
   merge doc improvements from jblack

 * lord@emf.net--2003b/tla--devo--1.1--patch-65
   merge pristine-search improvements to star-merge from mt@wmipf

 * lord@emf.net--2003b/tla--devo--1.1--patch-66
   tweak pristine search in star-merge

 * lord@emf.net--2003b/tla--devo--1.1--patch-67
   merge in help message fixes from giles

 * lord@emf.net--2003b/tla--devo--1.1--patch-68
   add (currently unused) limits parameter to what-changed and arch_make_changeset

 * lord@emf.net--2003b/tla--devo--1.1--patch-69
   coded up (and roughly tested) limit spec -> loc translation in make-changeset

 * lord@emf.net--2003b/tla--devo--1.1--patch-70
   canonicalize the limits argument to arch_make_changeset

 * lord@emf.net--2003b/tla--devo--1.1--patch-71
   compute orig logs of paths in limits in arch_make_changeset

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-3
   merge from lord (patch-56)

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-4
   star-merge from lord

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-5
   repaired patch-log for patch-56

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-6
   propagate cache_dir to arch_build_revision

 * mt@wmipf.in-berlin.de--devel-2003/tla--wmipf--1.1--patch-7
   in arch_star_merge, use cwd as cache_dir

